fix to avoid extracting some cases