fixing issue with handler overrides