fix delegate handling for 10.10