Fix force-expanded bug