Fix bug in availability objects