WIP - Bugfix: Commands >1 did not work