A little change in optional fields behaviour