Fixing references, see #89