Sonata bugfix