fixing handlers