Fixed to match newest version of swift