Bug 1056

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