fix to hybrid solver