Even more and fixes #3