Fixed issue: Fixed previous commit