correct bugs introduced in last push.