Fixed #7, #6.