Fix topic updating