Fixes https://wpftoolkit.codeplex.com/workitem/20299