Trying to fix 1.7 item errors