fixed bug in firstpass versions
fixed bug