some code fix...