bug fixes.
fixed StackOverFlowError, oops.