master #7 fix