Contributed to fixes #3