* improve On* methods signature (thx Richard)