Fixed  keypath parser