more issues - fixes #3