Fixing stuff, take 3.