This should fix scatter completely