#386 Removed duplicate setting of id