test and small bugfix