Attempt at fixing #25