Bug 2573

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