Fix for [Fudge]