Fixed #75