Third try to fix the 1.8 issue.