See attached simple patch.