Fixing constant issue