Fix #41 - get rid of RE's