Fixing null field