preliminary fix of program breaking bug