Fixed issue 64