7.x.sample objects fix