fixes #6, closed #6