[FIX] Missing part of the revision 5f6fc473