fix to work with id generators