Bug 956

https://gist.github.com/kkorekk/6c883ade9c69b5729f65