workaround for #34