Fixed #257