makeshift_define_command works around issue #2