changed regex for handle