Fix looks sound, but the naming is getting a little squishy. i.e. mkt_close is not exactly mkt_close here.