Refactored, so that * is now not escaped