Fix #2259 .
Merge pull request #2261 from take-cheeze/fix_2259

Fix #2259 .