bugfix, changed api