A bit of refactoring and replaced a forgotten id with guid