Added fixes #3