Fixed previous commit errors