Fixed issues of last commit