Trying to fix Satis bug