Fixed #265