Final fix for broken compilation.