Re-rolled patch #3, Fixed custom command failed.