Fixing issue caused by last commit