Fix bug regarding to availability