Stab at fixing #21