Bug 952

Gist: https://gist.github.com/Neob91/a50f8536aa5c74715c36