Fixed #7