Fixed issue with multiple tags skipped