Fixed issue 111