keeping handlers consistant