Applying patch provided by Malintha to fix no version API