Fixed issue: Fixed mistakes made in the previous commit