additional filtering for 1.8/1.9