Re-tested with Click 3.2