fix improvement 4d3198fea34b6ef2aa2d1e7c82e1bae269728f06
merge request #1