Fix isSupported check