Fixed varying constants issue