In fact, the following patch works for me.

Signed-off-by: Chris Rankin <rankincj@yahoo.com>