fixed issues (hopefully)