Fix #1110 F3.0

Fix #1110 F3.0