Helm switch project

Hi Bozhidar Batsov:

I just submitted a minor fix. Please see the commit message and the diff for details.

Thanks