Fix #6 and #8