Some Bug Fix.