Fixed optional arguments

Fixed optional arguments
Reported by: Harish Vijayaraghavan <harishvraghav@gmail.com>

QA Notes:
Testing Done:
Documentation Notes:
Bug Number:
Reviewed by:
Approved by:
Mailto: