#117 fixed