LAMBDA-96: fixing overwriting required fields