Availability check fix