add fix for spaces