TypeAvailability bug solved