Fixed bug when handling optional arguments.
Fixed bug when handling optional arguments.

bdurrow/design-center,tzz/design-center,tzz/design-center,bdurrow/design-center,bdurrow/design-center,bdurrow/design-center,tzz/design-center,tzz/design-center