Fixed item render issues