Trying to fix things...

Blarg, this is being difficult :|
Fix...