retest #217

not a long term solution, but should get by the issue for now, see TODO
note in the code