fix backward compatibility return