Updated to fix problem with Delegators and View Helpers