bug_1042

https://gist.github.com/kkorekk/82fee832cf7e108cba21