U4-663

Fixes http://issues.umbraco.org/issue/U4-663