#11, #12: bugfixes