finally fixes #16