Fixing badness in release mode.