fix for TW 8.22