this may need some tweaking, and will cover that in testing, but this should be a start to fix #38