Modified return value #18