Issue 2568: fixing switch and fixing the issue