Fixed KeyboardIntterupt issue