Make sure that weights are stored in struct (#710)

Make sure that weights are stored in struct (#710) #2119