Merge branch 'ufo-fix'