Use the handler instead of a dirty variable