make default-to-current-class work