Returning to disarm effect properly