enhance utility module
fixing some function