Fixed #ver support