Attempt at fixing #5.