Fast workaround for #8