Move ":" check to proper location