Fixes empty && only state