[bugfix] Fix for NB#704.