some code fix for last commit