return value fix #2