Fixed backward compatibility code