Removed bug on monitoring