[Handlers] fix