Minor change, attempting to support the MCF API