Fixed availablity test