An initial attempt at fixing #95