hotfix for return from bad data bug