Tweak to allow for case when weight is explicity None