working again with correct regex