Minimal patch to validate. Fix #740