bug fix.
clean up.