slight simplification to #33 fix