8-8-13 fix