GH-37: upgrading to when 2.x seems to solve the issue