In previous commit ocurred an error. Now added these changes.