Bug fix, CF in wrong spot