bug fix for alternative data model