fit new version of swift...