Fixed issue check availability issue