some code fix.