extracted Westerboer STF fix