Workaround for #907