Added proper version offset check for future use