fix bug introduced by previous clean up. more clean up.