An attempt to address #401, cross fingers this works