Fixed #9