Fix bug with constants