K3.1 Fixing some issues: #2386 (part3)