Fixed issue790