Fixed issue1