Fixed issue 67