The attached patch may fix tickets: