Workaround for #340