Fixed not being able to change topic

Change-Id: Ic11fdca91f6b8cafa3c256280abc8c6914309396