Fixed custom command failed, Attached interdiff for #10. Please review.