Bugfix in rescue