fixed broken value return