Fix: no trailing space if not abbreviated