Fixed topic issues