Fixed step 3.1 availability detection