Fixed #271