Attempt at fixing #21