fixed returning values