Fixed splitting issues on colon