Fixed issue 131