fixed bug per Harrison's all night debug