Fixed circular reference
Fixed latte engine