reduce fill() scope for some cases