fix to work with 3.1m5 and with cfy maangement network