New commit and fixes #3