Fix: bug https://bugzilla.xamarin.com/show_bug.cgi?id=14811 (to be reviewed)