fixed two things in handlers