Fix the issue in commit e8d144f520ac77dd8d5b65fe78544788caad98f0

I fixed the previous issue. One thing left is to move changeproject to
another class