Adding topic fix