attempt at fixing #7