fix for NPE on card