Attempt empty-fields part 2