Made Fill less error prone to changes