Fixed issue 130