small bugfix, marked another bug (@todo)