(hopefully) finished filler fixing, for #1513