Another return value fix