Fixed id_func and clock

I dont know the project, but I think those changes make it wroks, at least for me.