bugfix: really return only wanted