Added hack to get crypto working for now