Fixed #! per Pat's Request