defensive programming
Merge branch 'master' into ff