Bug fix, fill_in needs to be static