fix issue with unexpected data