I guess thsi change is ok but @kimchy should look at it as well?