Expert Mode fix.