Fixing stuff, take 2.