fixed empty object issue