Fix development-testing induced crash on second use