Fixed mismatching handler signiture