Bug 948

Gist: https://gist.github.com/Neob91/1a03f052a4d6b62028d8