Fixing partial monitoring issue