fixed issue bug