Fix solution sourceId !=null