|#975| Changes to fix the bug