fixing on() calls