fixing users and incidents model