Merge Issue fixed

A piece of the jelly was moved prior to my commit, no other changes
noticed. Fixed merge.