Bug 1023

https://gist.github.com/pkucmus/e976291c378bee11e144