Merge "Fix bit crash"