Further Fix as per #76