Canonical really fixed (maybe?)