Fixed previous commits