Fixed issue 78