Fixing some spaces