Testing issues that fixes #3