Fixed #269