Issue: #444 - Fixing the script