#71 fixed