Double % Int workaround
Merge pull request #1505 from Cinderella-Man/2.0.0

[2.0.0] Double % Int workaround