Fixed bags #9434, #9435