in-class bugfixes