bug fixes (#5846)