Fix/encrypt compat