chg: adapting fix to support iceman forks extended commands.
---most likely broke something.. :) needs proper testing.