Maybe fixed have/want shelf weirdness