ACTUALLY fix problems this time