Constants fix