Fixed backward compatibility issue