Fixing horrible, horrible bug