Space.class conflict fix