merge in ohardy's fix