Small fix to my earlier fix