GH-973 removed an extra and unnecesary off() call