Fix hanging recreate