Temporary fix for MC1.5.x changes