Fixes #2. Another changes