Workaround DB-962