Tried some more work-arounds for #205, but I am not sure I got it all...