#22 bugfixing