Fixed #330