Fixed for Sugar 7