Final part of the fix #1069