Bug fix with latest merge