Fixed #158