Fixed issue 66