handler fixes