Fix topic macro