Gyration: I forgot one optimization (I also fixed a bug introduced in the previuos commit)