Resolve #478 with 50% confidence