fixing some function
fixing some function