Fixed #6