Bug 2563

https://gist.github.com/piotr-mazurek/5a1ca2aaff43ebd7224c