Quick fix for availability