Fix dynamic command types not working as intended