HOPEFULLY FIXES