WIP: fixed regex