corrected bug introduced in last commit
Merge branch 'master' into ICare