Fixed #7, #8