bugfixes: #5, #7