Fix constants case