Fix for FAD,AMG,SPG