Fixed replacing . in keys