Fixed id problems