Bug 955

Gist: https://gist.github.com/Neob91/7804ab10c3e59adc2771