fix for newer version of haystack