Version that works properly on spinn-10