Fixed issues in last commit