#issue1 fix