Bugfix in Monitor entity