Temporary constant fix