Bug fix with scripts