fixed issues from Github