bugfix for return value