Another fix for variable regex