Fixed missing monitoring #26