Fixed 1.9.x => 1.8.6 incompatibility