Fix for 6/6 trace/space rules