Fixed to work as subproject