Fix .off for handler mismatch