Fixed issue with last topic not being added