fixed issue with constants