Add missing fix, modified with commit: 33399e5cc7be4cc9d85a9082181203725be05d8e