Small Fix related to last commit