Bug fix with download