Revert "Revert "Better fix for #43""

This reverts commit cb8e1e0c0ff614b365622e1343ad264a98a4bdd4.
Versions update