Fix #1393

Fix #1393