Fixed #408 -- cleanup how is_available works