NEW: Fixed repeat within user-defined command bug