Quick fix to avoid JS exception