#261 more bugfixing