Fixed issue in last commit