commit #17.2 - {fixed an id refactoring error}