Fix problem in Firefox.
Fix problem in last demo.