Fix #8, #9