fixed subscription bug