Core/Auctionhouse: Better fix for 809fb9894ec5ee5a