Fixed #251