Workaround for #8