made some workarounds for buggy ofdb