Removed mixing, use a simple regex instead.

Removed mixing, use a simple regex instead. #168