fixes #1 id issues