Fixed #293