Corrected a bug with the delegate message interception