Fix #600
Fix #601