fixed dynamic keys functionality