#2. Fix for Moz2?