Bug 1616

https://gist.github.com/novirael/32fdbe9b77747cf044c9