temp bug fixing on return calc