Fixed optional delegate methods calling