Revert "Revert "Fixing multiple version troubles""

This reverts commit ec8ac1df2f22b1f110e344de05644bc31645ab4b.