BUG FIX: Avabilities are not updated