Fixed Broken Commands from 0a97290414a0cfe7da2f0a6e259c95e79c810e54