Added fix for bug #11855

Fix for bug #11855
https://bugzilla.xamarin.com/show_bug.cgi?id=11855