Fix #3249
Merge branch 'issue3249-fix' into qifun