Fixing the defender