Fix minor JW bug