Fixed issues with receiving by kit, not by id