Fix with better swift