Fixing bug introduced in #183. Making sure we can use custom keystores