Bug 1048

https://gist.github.com/pkucmus/71106c39613f82f0b47a