Fixed swift support