Fixing Value Type Returns