Removed tabs introduced in my latest changes (sorry), added missing break

Regarding missing brea, @scrawl will you approve that?