Fixed backward compatibility