Resolved cb-app detection issue