Workaround crash. Vlj, please look at this, this is probably not an idea fix!