Note for #598