Bug 1035

https://gist.github.com/pkucmus/16ffe0cb845317649313