Fixed #1638

Also (should) fix @phuu's issue with tab size.

Though, if I'm honest, I'm not 100% sure *why* this works...