quick fix on availability validation