Fix #691 and fix double-spaces after colon