Fixed issue 124