better lastClef handling