Fix for xs