Workaround for command conflicts. Fixes #21