fix issues with this in handler methods