fixed issue with handler