wild guess to fix an apparent bug that was introduced when I merged in the other branch