fix https://odyssey.codeplex.com/workitem/5663
fix https://odyssey.codeplex.com/workitem/5436