fixed swift stuff