Fixed dispatch of calls to defs with restrictions