issue fixes #6