Fixed #302