URGENT FIX FOR JAVASCRIPT CLIENTS!