Fix issue1 problem