fix availability macro