bug fix for availability problem