Retested with Click 2.4