Fixed fillin to handle defaults