Citystate capture fix