Fix of http://issues.umbraco.org/issue/U4-5025