Removed is_single() condition