small bugfixing in the recently added functionality