Fix for T7918