Hard fix for duplicate callback