Improve fixes #77
Improves fixes #77