stupid fixes for the id