Fixed issue 62