Hot fix round 2

Using SNMP now as well :)

Change-Id: I3b3f0793197c33274905ca438f42d01e0529ba82