added issues to fix