Fixing Switch conversion