WIP: fix regexp