fixing monitoring stuff.

Hi all,

Please verify it this commit is worth of merge.

Cheers,

Edu.