Improve the fix to forme change