fix those pesky hardcoded id's