FIX: more specific space situations fixed