another fix for derivation
and another
fix salt