fixed issues hopefully