fixed object keys handling