Bug 972

Gist: https://gist.github.com/Neob91/2297143415769409167a