#2. Fix for Moz3?