Small fix for 2.1.1 Marshal