fixes 48376627
merging in 48376627