Fix #7
Fix #6