Fix #674
Fix #673