Fixed issue 123