new attempt at fixing #97