Might have fixed it for real this time...