Fixed issue17