Fixed OO project