Adapt to scatter 0.5.3