Fix for U4-5633

http://issues.umbraco.org/issue/U4-5633#comment=67-16689