Fix #1158 for F31