temporary workaround to avoid crash until properly fixed