Fix for new swift