Attempt at fixing #2