fixed to call handler twice when the handlers are implemented.