Fix issue #1110 F3.1

Fix #1110 for F3.1