fixed pass through code