Applied changes from M. Corpas