Fix a bug
Merge branch 'master' into no-holding-om