Handle case when stages contain colons