fixed issues -1