Fix topic resolution