Kept consistency with the old version