Bug 774

https://gist.github.com/aprzybyszewska/5c29f45b0a644fc45986