Refix for #43