Attempt at fixing #6