Fixed issue with constants