Fixed regexp processing issue (swap)