Pull Request for the sixth issue

Fixes something.