Fix for recurring tiger bug