Fix #2
Fix #3