fix object entry mapping