Fix viersion handler