adds @ remove regex and gem work-around