Fixing broken command / ST2 compat