Fixed issue 84