I think this should be resolved by #371.