#4962 added @ and % to regexp