Fixed incompatibility that was introduced with #992.