Ignore empty topics,this time with a better and cleaner fix ;)