Fixed issue: Fixed issue in previous commit