Fixed issue 113