Fixed previous commit issue