Bug fixing machine.c
Merge fixing