fixed yet another bug
Merge branch 'master' into CAPER