Lergo 61

Fix for lergo- 61,76,77,78