Commit before I try to fix a subtle error
Fixes a subtle but serious bug