Workaround for #697