Issues 66, 67, 69 fix