initialization hack removed