Fix for backward compatibility