Fixed issues with handler