Fix for loading custom delegates