Another try to fix this project