Fix bugs. as previous saving bugs commit failed