Fix another parameter handling bug

Change-Id: Iba72087a5903f7a21047d362408f1be5a01a2e07