Modular

Fixes an issue with dynamic commands running properly.