Fixed solution corrupted by xamarin