Oops: Re-added my fix (got lost in merge)