Fix #693

Fix #693