completely fixes #116