issue #3. Another changes