Fixed previous commit's errors