Another handler fix