AF-918 adjusted return value