Constants bug fix