Fixed spotz not being returned on exit