fixed issue with legacy data