Fix for data configuration