Fixing Switch dependency