#39 should now be fixed. Got rid of my previous failed attempt at #21