Fix for spaces