attempt at fixing #4.