refs & corresponding parsing fix