Revert "Constants fixed"

This reverts commit 2d686caf3bef3fcab4f0618d25a0a2c9ff9799d8.