Constants workaround
Merge pull request #1579 from Cinderella-Man/2.0.0

[2.0.0] Constants workaround