#69 and #10 are in the way
#10 fixed, for now
fixes #69