#2. Fix for Moz5?