Hopefully fix regex issue