Fixed issue with unary references