Hotfix/preserve by regex