Merge “Fix crash”