Fixed #300