minor change to handler