fix monitoring & log