Fixed #266