Fix #1098

Fix #1098