Fixed custom command failed, Attached interdiff for same. Please review.