Fix ZfcBase