Fix #8 and Fix #9