Patch for Issue #124: Default values would over-ride supplied values