Fixed #272