Fixed #4, #3