reverted to old regex