Fix, suggested changes applied