Modified to mono 3.4.0