Fix for Mock 7 config