command passing fixed
features backported