fix in handler