updated for latest haxe