Availability fix