Fixed issue 61