Fix for enableForwarding being called twice.