Apply changes according to Juan's feedback

Related to: 1353