temp fix for #725 bug