added temporary workaround until fix to lib will be merged to upstream