Hack fix for invalid calloutlist