Fixes #2785

Well... I spent more time discussing about the issue than fixing the issue itself.  :)
Ran all the specs locally and it is working fine