Fixed commands not triggering properly