Critical regex fix, lost many checkins due to this... :P