Fixed issue for returning values