#50: fixed up references