Id bugs fixed