supposedly fixes #7