Stop adding constants in the wrong place