Fix for NPE: Removed switch rule