Fixed issue 75