My first issue that fixes #2