return error fix 2 (untested)