Fixed #299