Fixes double calls to delegate