Fix topic changes