Fixed issue 994