Fix for backward compatibility failure