Last on() fix, I hope
Update doc