Fixed broken CMFactory