fixed issues from list goes on