Project functionality - bug fix