adhoc 'fix' for multi crashes..., to be reviewed