workaround for #488