fix for keystores