another attempt to fixes #3