Fixed breaking strict-aliasing with merged jb 2.6 code