Fixes #32 : Ensure keys are correctly parsed