Trying to fix Swiftness