Fixed wrong subscription bug