Fixes #331 per issue at http://n2cms.codeplex.com/discussions/464970