fix sonata problems