work related to https://rclr.codeplex.com/workitem/22