fix for #703, waiting for confirmation