Quick bug fix
Constants reorganization