fix for data structure