#2. Fix for Moz4?